fix #44
Merge branch 'DatabaseServer' of https://github.com/skiadas/PanthR into DatabaseServer