added util thing
Merge branch 'master' into steven