Added support to Viper
This fixes #9 (Viper implementation)