Fix for #4 , #5