Merge pull request #135 from Netseave/master

removed leadings/whitespace & fixed tiny alignment issue in grid
updated 404 error msg as per #93
Merge remote-tracking branch 'upstream/master'