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