Merge pull request #3 from davidjust/develop_0.3

Develop 0.3