0.3.0

Added license
Merge branch 'master' into develop