Merge pull request #6 from roselone/master

3-15 from roselon
commit-bxl-linux-2013-3-15-textformat
Merge pull request #12 from bxl1989/master

pull 3-15