Merge pull request #62 from Sriii/master

master to marc
Merge pull request #68 from Sriii/master

master to marc
Merge pull request #75 from Sriii/master

master to marc
Merge pull request #80 from Sriii/master

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

marc to master