Merge pull request #1 from 5mil/dev-0.1.3

Dev 0.1.3
Merge pull request #3 from 5mil/master

Merge pull request #1 from 5mil/dev-0.1.3