Return 404 status on a 404 page. Fixed #33
Merge remote-tracking branch 'origin/master'

* origin/master:
  Updated Tips section