Merge pull request #2 from SyntaxError2014/master

sdvksdv