Merge pull request #19 from cldx/master

Updating Makefile and metadata to Ozon
Merge remote-tracking branch 'upstream/master'
Moving to Intellihide, more testing needed
Intellihide changes