Broken boolean logic branch is ready for merge I hope. see #32