fixes #41 closes #53

thanks @Worldexe