Issue #176 

Merge please.