Usage example and a bit of clean-up
version update