Merge branch 'development'
upgrading version to 0.0.3
Merge branch 'master' into development
upgrading conditional dependency