Fix #21
Fix #25

This is not the way to do it finally but ok for first release.