bvssvni Merge pull request #59 from bvssvni/master …