This commit fixes the "Black must connect" bug
Closes #61 and closes #54"