Fixed issues described in card 190
Merge branch 'master' of https://github.com/resultares/esolutions