Patch 3

Consolidating branches in my own fork.