Merge pull request #88 from sjanc/141

141