Merge branch 'pr/1'

Conflicts:
src/DBHelper.java