Add link to WIKI
fix zp #822
fix #3

Somehow this method got deleted
Merge pull request #4 from sbillard/master

bug fixes