bvssvni Merge pull request #218 from bvssvni/upd …