Cleaning up some code mess
Merge branch 'master' of https://github.com/dansoah/D1000