version updated
changelog stuff fixed
Merge branch 'master' into stable-0.4
changelog stuff fixed