Added boost::function
Removed debug output from test.
Re-indentation.
Started to implement exception handling.