alternatives that have deprecated noted as such
Merge pull request #109 from havenwood/upstream

alternatives that have deprecated noted as such