Version 0.4.0.beta
Merge branch 'development'