Merge pull request #14 from wgallios/dev

Dev