bvssvni Merge pull request #37 from bvssvni/upd …