#88 - correção no menu de contexto
closes #88
closes #81
Merge branch 'issue-81'
Merge from issue-88