0.2.4
Merge #43 r=@johnnyman727: 0.2.4