Merge pull request #45 from bjoern-esser/master

small fixes
calling bootstrap with curdir-prefixed