Bug fixing and improvements
Adding a complete example