Merge pull request #21 from vataware/develop

Develop to master
Merge commit '9201a39f77d276dd4a03abfc5fafb38b7ecc3f2e'
User friendlier error pages