v0.1 final commit
initial v0.2 branch commit
added pm support
Merge branch 'v0.2' with master for deployment