This was deleted by mistake. I'm adding it back.
Merge pull request #126 from rmdstudio/master

This was deleted by mistake. I'm adding it back.