Merge development branch for version 0.2