Merge pull request #5 from adslaton/dev

Dev