Merge pull request #13 from tbenade/master

Looks ok to me, thanks.
Bumped version to 0.2.5 after pull request from @tbenade.