Merge pull request #1 from TheOneAndTrueAcid/horizontal

Horizontal into Master.
Merge pull request #2 from TheOneAndTrueAcid/master

Merge pull request #1 from TheOneAndTrueAcid/horizontal