bvssvni Merge pull request #46 from bvssvni/upd …