mike edits
Merge pull request #1 from cgdang/mikebranch

mike edits