Merge pull request #3 from ienien/master

Ok
Merge pull request #4 from mriclet/master

Merge pull request #3 from ienien/master