Merge pull request #1 from qii/0.50