Issue #4 and other improvements