2.2.1

Fixing #4 and #5.