Fix issue #30
Fix issue #28 #29
Merge branch 'master' of https://github.com/Medialoha/MAB-LAB.git