Report updated
Merge branch 'master' of http://github.com/flashman/spahetti-factory
merge for report