some new changes from work in separate branch
1232
Merge pull request #1 from ceghey/Work-Fix-1

Work fix 1