added bootstrap and did some cleanup
Merge pull request #7 from olivier-squid/master

added bootstrap and did some cleanup