Merge pull request #14 from danielballan/merge-mr

Giant Merge
Merge pull request #16 from danielballan/support-nonrecursive

API/TST: Support nonrecursive link through keyword argument.