Some helper functions added - README update pending (wrong way - I know ;-/