lml/quadbase — pull request #98 by Dantemss (2012-05-14 22:57:09+00:00)
Title: Issue40

Fixes issue #40, issue #41

Note: merge database branch first, this branch includes changes from database branch (because I merged database into my master branch before branching this out)