closes #62 Fixed