Fixed_implementation_issues #233
Fixed_implementation_conventions #233