libr change
Merge pull request #1 from etenzor/john

libr change
Merge pull request #2 from etenzor/robby

changes to libr + acc
Merge pull request #4 from etenzor/master

Merge