Merged PR #76 into stable