Fix #18 improve default behavior