Putting on development branche...

I realized it just now... Sorry
Loggind exception according the TODO.
Solution built...
Merge pull request #22 from volkoinen/dev

Putting files in the correct branche.