#94 Minor edits due to lib version change