Beta-version

Here's hoping for no merge issues!