gorkang Merge pull request #41 from gorkang/dev