Fixed text placement issue.
1.2.4 - fixed ETA.
Minor performance fix.
Merge pull request #2 from jrossignol/master

Sync master