Without vs solutions

Fix for #32.