internal changes
implemented IDisposable on Database
Merge branch 'develop'