added more notes
Merge branch 'feature'