Fix bug
Bump to version 1.1.4
Merge branch 'bugfix'