Hotfixing the bugs
Merge pull request #12 from Yoast/trunk

Hotfixing the bugs