Merge pull request #13 from Svobik7/master

Metronic update from master
Metronic-integration branch fixed
Merge commit 'c4e9465eb5c40662d2de781e4ee84ea30b4cd981' into Metronic-integration
Metronic-integration branch fixed