PCBK-184 and PCBK-189 Fixed.
Merge pull request #65 from popcm/release-1.1

PCBK-184 and PCBK-189 Fixed.