Merge pull request #33 from talves/master

Fixes for 2.1.4
Closes #31
Closes #32