documentation for developers
test commit in Windows
sugar
Merge branch 'master' into mark
refactor, more OO stability