Fixed #45 by merging branch 'Exort-develop'