Issue 52 - Extra Connections being generated

References #52