Version 0.1.6

Merging in #27 and #26.