Edit Me

Merged Sid Sijbrandij requested to merge edit-me into master

Fixes #36 (closed)