Merge pull request #183 from sjanc/141

141