Merge pull request #16 from mizdebsk/master

Fix MODELLO-284 and MODELLO-285