Added support for general purpose events
Version 0.1.7