Merge pull request #517 from getsometoast/master