Merge pull request #243 from xeno-by/master

migrates to paradise 2.0.0-M6