adress #66
Merge branch 'devel' of github.com:saga-project/troy into devel