Merge pull request #61 from Hasimir/master

New variants and some minor fixes.
Merge pull request #62 from Hasimir/master

Minor adjustments of WTFWJD and WTFWJDRTFM.