Issues #174,  #178,  #167, #180
Merge remote-tracking branch 'refs/remotes/origin/master'