refs #10
Merge pull request #11 from pandeiro245/iss-10

refs #10