Merge pull request #18 from cboppert/master

Merge LinkNY changes