questions sub parts and fixing nill case for relationship story
Merge branch 'master' of https://github.com/tommyadey/aries

merge with upstream master