- fixes for issues #1, #4