Merge branch 'master' into stable
Change version to 0.1.1