fixed merge conflict in @wasade's changes 

replaces #58