Merge pull request #27 from OSN64/nig-devs

Nig devs
Merge branch 'master' of https://github.com/OSN64/rollingpin into nig-devs
merge