Added knaust, closing issue #31