Addincres

Per JF this logic has been reviewed by RAAC members and is ready for incorporation into the master branch.  This resolves #1.