Fix for #4 + neat new feature