Fixed issues for 1.0 release
Merge branch 'simpledb'