Closes #1 - WordPress 3.6 support

Tested WordPress 3.6 compatibility