Merge pull request #227 from djay87/master