Fixed #41
Merge pull request #42 from mbg/41

Fixed #41