Fix issue #210
Merge branch 'master' of https://github.com/jdsutton/live-editor