Merge pull request #277 from godlikeachilles/master