Issue40 41

Fixes for

https://code.google.com/p/jukito/issues/detail?id=40
https://code.google.com/p/jukito/issues/detail?id=41

\+ merge & formatting