resolved merge conflict in @wasade's PR

replaces #58