[behnamoh]

Thanks for your feedback. I'll definitely work on these and update shellock!

Update: I pushed the changes. Please let me know if you find any other bugs!