Made some tweaks
Prepared to release 0.0.18.