Improved and properly implemented Spritzer.
Merged with master