Issue 1 fix
Merge origin/iss1 into iss1