Merge pull request #2 from wgallios/dev

dev