Fixed and closes #10 , closes #8