mdkent Merge pull request #14 from fschueller/master