Merge branch 'master', remote-tracking branch 'origin' into v0.3
uml2rdb example updated