add some documentation, clean up a little bit
Merge remote-tracking branch 'origin/1.1'