Merge pull request #20 from bcail/master

code cleanup, and updating more titles to show the whole title
Merge remote-tracking branch 'upstream/master'