404 updated
Merge pull request #2 from nathantross/master

404 updated