Merged 0.5.1
Merge pull request #1 from jalet/master

Merged 0.5.1