Added perret318 changes
Merge pull request #13 from perret318/master

Added perret318 changes