fixes #40 Working fine now!