Fixing MB-699
Fix for MB-744 and some changes suggested in andes code review
Merge pull request #24 from sperera/master

Fix for MB-744 and some changes suggested in andes code review
:wq:Merge remote-tracking branch 'upstream/master'