merged master into Server, something went wrong with the FindShow source, so I copied from Android branch