Fix #60: Merge duplicate factory implementations#62

SoulEvill wants to merge 2 commits intodevstarfishdata/starfish:devfrom

fix-issue-60-merge-factory-filesstarfishdata/starfish:fix-issue-60-merge-factory-filesCopy head branch name to clipboard