Merge pull request #6 from NotTheUsual/master

Passed 400 test, added 900 test