Merged develope branch to v0.2 release