Updated for 2.0
Merge pull request #23 from Meneth/beta

3.3