merges
fixes
Merge pull request #249 from patriot1burke/Branch_2_3

Branch 2 3