improved documentation #57
fixed broken tests
Merge branch 'master' into peg