Rearranged and added utility routines
Merge branch 'master' of https://github.com/debinix/pbs