see TODO for notes
Merge branch 'master' of github.com:evertonstz/nitroslim