Addresses issue #10. Also, minor fixes.
Merge branch 'master' of http://github.com/tsdiokno/NightGazr