#11

@havice @shogolin 
plz review my code
fixed #11