Merge pull request #1 from nicklynchjonely/master

last of the proposals