Fix #281
Merge branch 'master' of github.com:po-devs/po-server-goodies