Merge pull request #34 from ohnova/master

reabase