merged and fixed
Merge pull request #13 from thinkaliker/master

merged and fixed 404/403