Convenience method for validating optional input.
GH #244 - Use smarter defaults.
Whitespace cleanup.
Fixed failing tests.
Merge branch 'master' into dsuch-f-gh290-sql-notifications