Update 0.8.1
Merge origin/master