DEV-56
DEV-56
Merge pull request #19 from evrythng/DEV-56

Dev 56
Merge branch 'master' into ENGINE-713