Merge pull request #3 from Meneth/beta

More fixes