somehow v0.1.14 commit/revision got lost... I merged that changes in this one.