Merge pull request #69 from f3cuk/Beta-2.1.0

Sync BETA and Testbranch
Added RPG support
Merge pull request #71 from f3cuk/Testbranch

Update the 2.1.0. BETA