Merge pull request #4 from RAPcores/sjk/ownflow1

build from our own repo making it easier to patch