commit bugfixes
Merge branch 'master' of https://github.com/lduenser/vSys2012