0.4.0
update doc strings
Merge remote-tracking branch 'origin/master'