Added support for property setting
Modifications for GitHub hosting