#9 - raise a 404 in case an object is not found
Merge branch 'release/1.0.4'