kovi44 Merge pull request #6 from benwaa/benwaa