Improves markup options per #1257, #1261
Merge pull request #1262 from voltan/develop

Add some chnage for pi 2.5