Merge PR #79

Merged PR #79