refs #12
Merge pull request #13 from pandeiro245/iss-12

refs #12