Merge pull request #3 from wgallios/dev

Dev