Merge pull request #8 from wgallios/dev

Dev