Version 0.5.6
Merge local changes and remote from github