ver 0.5.0.0 - small bugfixes
Merge branch 'origin/master'