added sqllite support
Merge branch 'berhacker' into production-master