Fixed #31
Merge #32 r=@kevinmehall: Fixed #31