Merge pull request #1 from ekstro/dev1

Dev1
Merge commit 'f2bff1c4932c6015a5615f59009cdc2e1e766501' into dev1