resolves issue 188
Merge pull request #195 from brethauer/bigmerge

resolves issue 188