thanks from wwangaz
Merge pull request #245 from wwangaz/master

thanks from wwangaz