Belman refactoring
Merge branch 'master' of https://github.com/Feylin/Belman.git