fixed a bug or two
Merge remote-tracking branch 'refs/remotes/origin/master'