Fixed two issues, #2 and #9