Merged pull request #14
Merge pull request #15 from rogerskw/iss4-6-7

Merge pull request #14 into master