merge makran_update into master

Solves issue #11