Final fix applied to #2
Merge branch 'master' as a late submission merge with quick fix