Fix #4 issue
Fix #5 issue