modified a bit around on modify. This is not yet the final thing though
Merge pull request #20 from roger-wolf/master

modified a bit around on modify. This is not yet the final thing though