merge unity into master, R package ready