Fixing merge error
Merge pull request #6 from Tlantic/v0.4.1

Fixing merge error on 0.4.1