Merge pull request #92 from javajigi/feature/restore-markitup

Feature/restore markitup