Build #384:   Merge pull request #144 from bneidhold/dev on branch dev almost 4 years ago