Move

merging move+show into master plz
@boredsteve 
@robedgecombe