merge
Merge branch 'master' of github.com:siigna/porter
 adjusted line width