merging and small edit to pull #45