Merge branch 'bugfix-1' into 'develop'

Changed the aux directory to utils to avoid Windows directory naming conflict

See merge request !4