V 0.5
Merge branch 'master' into development