Merge pull request #46 from dvayanu/master

https://jira.opensource.anotheria.net/browse/MSKCONTROL-59