replaced code logic lines 10-17
Merge branch 'build003'