Fixing StaticProperty and adding InstanceProperty
Fixing StaticProperty and adding InstanceProperty

rmboggs/commandline,Thilas/commandline,Ehryk/commandline,Thilas/commandline,Emergensys/commandline,anthonylangsworth/commandline,Emergensys/commandline,Ehryk/commandline,kshanafelt/commandline,huoxudong125/commandline,huoxudong125/commandline,anthonylangsworth/commandline,nausley/commandline,nausley/commandline,kshanafelt/commandline,rmboggs/commandline