Merge pull request #18 from geekjuice/master

Fix override of position and check for content