Merge PR#18 'sieverssj/RAVE-1274'