Merge pull request #1 from vforgione/dev

add in changes for event emitter
Merge pull request #2 from vforgione/dev

Dev
0.1.4