issue 53
fixed it
finised issue 53
Merge branch 'master' into iss53