Supercommit 201402242035

Added touch support. <3