Version 0.5.1
Merge origin/master