Replaced usage of placeholder tuple with maybe.
Added missing docs and aligned all the vars.
Merge pull request #1 from mptre/master

Replaced usage of placeholder tuple with maybe