Fixed #147 v2 (Resolved merge conflict)

I resolved the merge conflict between latest bug_bounty_3 and my #147 branch.