Added get() and set()
merged cleanup branch