Added a few features and some examples