Fixed #42 (Closes #42)