fixed my merge-trouble (#16)