Now working on version 0.8.1

Change-Id: I680783195d299ae2689bea075dd04a26210b30b0
Merge "Now working on version 0.8.1"