Regarding the Robson Felix, there is a forked version that has made some fixes, taken out some unnecessary things, and been a little more security conscience as well. So may be worth taking a look at their forked version and incorporate changes into yours.