Merge pull request #4 from 30x/XAPID-824

Make viper calls thread safe.