Merged pull request #22 from wolberd