Merge 48

Merging pull request #48