Merge pull request #247 from fmscode/master

API Improvements
fix breaking events api test
Merge branch 'enhancements'