Workaround Bug 13 + README update