fixed bug for pushpin
Merge branch 'master' into chr
Merge branch 'chr'