Update regarding issue #10 thanks to @Patabugen