Kebabilicious. fixes #83
resolved merge conflict for issue 83