Merge pull request #12 from avogler/develop

Added configurable options for gitflow