Merge branch 'dev'
better formatting of petri_set
Merge branch 'dev'