thanks michael, rc fixes
Merge pull request #7 from faizkhan00/michael-0921_z

thanks michael, rc fixes