Merge pull request #5 from HugoMichi/master

deletes added
Merge remote-tracking branch 'upstream/master'
merging test
make corrected