Fixed: markup resolving bug.
Merge branch 'master' of https://github.com/guryanovev/JohnSmith