Simple crash fix
Merge pull request #29 from smarthimandrew/bug-fixes

Simple crash fix