Fixes for #3

working great