tdmalone Merge pull request #1 from thomassnielsen/master