Improvements to unknown type and year handling by @michalgregor (see #7)