Merge pull request #6 from jetthe/3715