done req #001

commiting changes after req #001 is done
test
added fix 003