davidhund Merge pull request #7 from littlebigbot/master