Fixed issue #4

Am terminat cu modificarile  :)