Aug 30 patches

* close issue #174
* close issue #175