added getters and setters where possible.
Merge origin/master