Fix for #66 + Small addition