Fixed database issue
Merge branch 'development' of https://github.com/michaelianjones/hasten into development