Merge pull request #1 from jivesoftware/master

Changes to Main
Merge pull request #11 from ryanrutan/master

Merge pull request #1 from jivesoftware/master