Updated to make it compile - merged skinnyjames#10
Open
dsisnero wants to merge 2 commits intoziprandom:masterfrom
Open
Updated to make it compile - merged skinnyjames#10dsisnero wants to merge 2 commits intoziprandom:masterfrom
dsisnero wants to merge 2 commits intoziprandom:masterfrom