Merge pull request #1 from TheOneAndTrueAcid/horizontal

Horizontal into Master.