Reworked import statements to pass R-devel check
Merge branch 'decctools-0.1'