Update roxygen
Fix for #9
Minor tweaks / whitespace