Reimplmenented property methods as outlined in issue #13