start #121 and change log (#71)
Merge branch 'master' of https://github.com/Codexa/Firetext