Various updates.
Merge branch 'dev'
0.2.0