Fixed issue where certain types of links would cause code to fail
Merge of d3test into master, bug fixes, and implementing new API calls.
Merge conflict resolution.