Version: 30th July 2014, 18:45 (GMT+1); added shape detector