Merge pull request #16 from Sriii/master

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

marc to master