Merge pull request #28 from MarquisAlx/master

fixes #27 and #26 makes the R script more robust
Merge pull request #1 from iLanguage/master

Merge pull request #28 from MarquisAlx/master