Merge pull request #46 from ohnova/master

rebase fix update