Added typeOfRunner filter. Changed dev config. Did some more stuff.
merged with origin