Merge pull request #205 from uwescience/production

Production -> master
raco: update with new features