Merge pull request #27 from Sriii/master

master to marc
Merge pull request #35 from Sriii/Marc's-branch

Merge pull request #27 from Sriii/master