fix #3 #4

Closed hytkgami closed 8 years ago