Various fixes for relationships and connection
Merge branch 'master' of github.com:ruprict/oriented