krismeister Merge pull request #72 from btmills/master