Merge pull request #1 from silshack/master

Pulling in stuff from main repository