bug fixing
...
manual merge
continue debugging and bug fixing
fixing #117