merging dev to master to push v0.5 to cran