Added example and a few more features