Merge pull request from HackerTDog/master