Fixes #35 along with DB update