More comments and action listeners.
Merge branch 'release/0.2-release' into develop