added on test2 branch
added on test 2
this is the merge from the local branch test2
fixing errors resolving issue #3