Merge pull request #32 from tisdall/master

SQLA default set with text() throws an exception.
Merge branch 'master', remote branch 'upstream/master'