fixed
Merge pull request #3 from Northshoot/issiue#1

fixed
Merge branch 'master' into dev