Issue 32

Some more fixes on issue 32