Added example and some small fix