More bugfixes (I guess)
Merge branch 'master' of github.com:tomrunia/Advanced-Algorithms