R CMD check is awesome
Merge branches 'dev' and 'master'