Merge pull request #35 from OSN64/nig-devs

Nig devs