#54 merge 0.4 into master branch