v0.1.4 merge to master

Do it :thumbsup: