Feature/getset

Getters and setters added