Merge pull request #6 from Robbqin/master

Sync master branch with experimental
Merge pull request #7 from Robbqin/experimental

Merge pull request #6 from Robbqin/master