Merge branch 'hotfix/1.1.1'
Bumped version to 1.1.2 for hotfix release
Avoid NullPointerException. Closes #129
Merged hotfix 1.1.2 onto develop.