Merge pull request #286 from 7sharp9/master

Simplified pipe operators, fixed edge case markup issues