#15

@havice @shogolin 
plz review my code :ocean:
#15 fixed