Fixed some issues.
Tag release v0.1.16