Develop

first pull request 
use setter to set values