Release/v0.6.0

Dear Sadegh,

I'm sorry about closing last pull request, it was a blunder!! I'll explain to you soon.

I just fixed the problems. Please check the last commit and if it was okay, merge it.

Many thnaks
Saeed