Added extensibility points
Fixed coding style
Merge pull request #55 from robocik/master

Added extensibility points