Partial fix for feature4
Fixed bug #2
Completed fix of feature4
Merge branch 'feature4-fix'