break long code lines
Merge branch 'master' into 3.0-updates
line-break long code lines
Merge pull request #11 from jrjohansson/3.0-updates

3.0 updates