Merge branch 'release-v0.5.2'
version 0.5.4
Merge branch 'develop'
Merge branch 'develop'
version 0.5.6
release
merge in release branch v0.5.7-8212014
bug fix
merge in release branch v0.5.7-8212014