Fixed #29
Merge pull request #43 from mbg/29

Fixed #29