bug 0002 v01
bug v03
Merge branch 'bug002'