bugfixes
Merge branch 'master' of https://github.com/DanielLagin/TIS_2013