#30
#64
#30: fixing merge conflicts
fixes #30