Part 2 fixes. closes #9
Merge branch 'master' of github.com:Snjoo/itks452