closes #155
Merge pull request #156 from homeyer/155

closes #155