Merge pull request #2 from definetux/master

Second attempt