fix index out of bounds exceptions
Merge branch 'master' of github.com:nnja/hackettes