Updated comments
Added Properties functionality and updated comments
Updated filename