Old remaked and unused code removal
Quick fix for issue #24
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into mbs