Added better undefined handling
Release 0.1.1