testing properties
adding properties
fix
merge properties feature into master