Merge PR#12 from 'sieverssj/RAVE-1093'