whoops...
whooops
Merge pull request #437 from wasade/changelog

whoops...