vio Merge pull request #143 from Commandtechno/master