Master commit
Merge pull request #1 from Cathret/master

Master commit