Fixed #23 thanks to @nachoft