first implementation of #60
Merge branch 'master' of https://github.com/anomaly/prestans