Updated README and port
Merge branch 'release/0.12' into develop