Program fixes
Merge pull request #343 from awolfs/master

Program fixes