Added some comments and samples