Better handling of alignment and new lines
Merge branch 'master' of https://github.com/dericofilho/php.fmt