Merge pull request #57 from ohnova/master

rebase