Merge pull request #6 from Robbqin/master

Sync master branch with experimental