clean up to avoid collisons on fast development
Merge pull request #4 from cd34/master

clean up to avoid collisons on fast development