Bugfix, removed dead code
Refactorisation
Merge branch 'master' of github.com:AbstractShanxy/AbstractBugs