finished, not tested
Merge branch 'master' of github.com:slee312/MatSciDB