limited support for evaluation strategies added
Merge branch 'generic' of github.com:ggrov/psgraph into generic