Merge pull request #3 from ingenieux/master

merging upstream changes