translating comments
related to issues #52
rebase master and update translate
improve and upgrade some functions