changed history
merge
clean up
Merge pull request #25 from OSN64/nig-devs

Nig devs