rags Merge pull request #22 from THeinemann/master