Merge pull request #12 from wgallios/dev

Dev