* Check with empty
* Fix phpdoc

fixes #657
Merge remote-tracking branch 'origin/next' into next