Move format
PHP 5.3 fix
Update change log
Merge pull request #123 from juriansluiman/move-output-logic

Move format output