Merge pull request #26 from nextup/dev

Merging dev features into master
last tweak
Merge pull request #29 from thrownblown/dev

Dev