Fix exit_status
Fix indentation
Merge pull request #22 from oliv3/master

Fix exit_status