Merge pull request #47 from BlackNoxis/experimental

Upgrading experimental branch.