Merge PR#14 from  'sieverssj/RAVE-1270'