updates for issues #24 and #25