Merge pull request #33 from firegiant/master

Add WIP for migrating v3 source code to v4.
Fix whitespace and link to 4561.