Merge pull request #7 from parsecsv/master

U2D
Fix for #27
Merge pull request #31 from williamknauss/issue-27

fix for issue #27