Merge pull request #7 from alexdavid/experimental

Merge experimental into master
Merge branch 'master' into experimental