Merge pull request #2 from vapour101/master

g