events code style refactoring
fix builder return value
Merge pull request #4 from mig35/other_projects_support

Other projects support