Merge changes from develop branch, release 0.2.0