Changed the logic for status code

hackhardrequested to merge
logic_status into master

More information here: #92 (closed)

Merge request reports