1.0.3
Merge remote-tracking branch 'origin/master'
minor misc
1.0.4