Merge pull request #13 from wgallios/dev

Dev