Merge pull request #257 from dejan-brkic/master

CRAFTERVMS-871