Merge PR#13 'sieverssj/RAVE-1269'