Bug fix and refactoring
Merge branch 'master' of https://github.com/hasjay/Exilesoft