ping13 Merge pull request #21 from ping13/bugfix