Added better 404 handling and updated version 1.2.1