Merge pull request #1 from assimp/master

test merge