Merge pull request #1 from nathggns/dev

Version 0.1.2