Merge pull request #5 from VittGam/master