final? version of Nicolas Wu, et al
Merge pull request #8 from ggreif/master

final? version of Nicolas Wu, et al