Merging PR #124, 125, 126