Release/v0.6.0

Dear Sadegh,

I just fixed the problems. Please check the last commit and if it was okay, merge it.

Many thnaks
Saeed