Merge pull request #27 from Sriii/master

master to marc