Merge pull request #39 from Sriii/master

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

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

master to marc
pics
merge