modified:   viper_mod.c
Merge branch 'master' of https://github.com/mortaromarcello/viper

Conflicts:
	viper_mod.c