Merge PR#10 from 'sieverssj/RAVE-1090'