Merge PR#15 from 'sieverssj/RAVE-1271'