added notes
Merge branch 'develop-0.2.4'