Added flat Value generator
Fix run extraction from decorator arguments to work with python 2
Some style fixes