Merge pull request #26 from stfnsche/master

release v36
update license mapping