making stuff nicer
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from chaosdorf/master

bootstrap