megurock Merge pull request #8 from megurock/hotfix