refs #16
Merge pull request #22 from pandeiro245/iss-16

refs #16