Closes #24
Merge pull request #25 from Weasle/1.5.3-pl1

Closes #24