0.1.6-SNAPSHOT

Has features #26 and #15