merged fixes from version 1.0.1