Issue 1 fix
Merge origin/iss1 into iss1
Merge pull request #2 from InScience/iss1

Iss1