Update #56
Update (2) #56
Update #57
Merge branch 'master' into dvl