FIX #70
Merge pull request #71 from ecomfe/issue-70

FIX #70