Stud1

I've made few necessary changes. I hope you merge them into your code.