Merge pull request #7 from jsuit/experimental

merge request
Merge pull request #20 from wesleyeewong/experimental

Merge pull request #7 from jsuit/experimental