typo
(#411)
fixed merge conflict
(#411)
merged changes in utilities.py from #343
(#411)