Fixed the positioning issues.
Merge pull request #6 from ruimalheiro/master

Fixed the positioning issues.