implemented untick() and uncmi()
Merge branch 'parser'