update
update test
update
Merge pull request #1 from AndreMouche/master

update tests && adjust directory