SCRIBBLE-151 Further refactoring to simplify api
Merge pull request #20 from objectiser/refactor2

SCRIBBLE-151 Further refactoring to simplify api