Merge pull request #98 from willyd/relocatable