Merge pull request #5 from snipertomcat/master

Major pull request