Merge branch 'NickOfTime-FindTheObject'
Merge branch 'master' of https://github.com/MBKish/NickOfTime