Merge remote-tracking branch 'origin/master'
fix #024, merge backend. fix logic errors in core.php @alexdebiasio