Bugs and more
Merge branch 'master' of https://github.com/DorsanD/Kuifke_1