Fix for #60 & Fixed NPE from Emiliano. a75af145d67855bf40aad33e2bfdb23a23c3b553 8af663a5d9740cbbfe475b1353bf8d87af7badc6