Fixed #209.
Fixed #203.
Added new test.
Updated version.
Fixed #199.
Fixed #196.