Merge pull request #26 from michal-niklas/master

omitting temporary tables and similar improvements

Author: rawktron