more cleaning
Merge pull request #3 from IOAP/rebase

more cleaning