Release/0.2.0

Never merged to master for 0.1.4 so this has additional changes.

Resolves #18.