Merge pull request #26 from freshprogrammer/development

Development
Merge branch 'master' of github.com:freshprogrammer/pyro