Fixes #64 apply changes from Vibe Java Platform 3.0.0-Alpha7