INSTL-47 fixed.
Fixed INSTL-48
Merge pull request #48 from BogdanMitrache/develop

Some fixes.