Tested for 3.9
Tested for 3.9
Merge pull request #2 from stijnvanderree/master

Small changes to comply with wp 3.9