Version bump to 0.4.0
Fixed: variable name conflict.
Version bump to 0.4.1
Merge branch 'master' into dev