Merge pull request #11 from sadlerjw/master

Merge origin/master into our fork
Make sure that positions calculated based on line height are floor() or ceil()'ed first.