Next attempt at the program
Merge pull request #345 from awolfs/master

Amsterdam program fixes