Back in beta mode and fixes #152