Merge pull request #338 from awolfs/master

Updates for Amsterdam
Bwaah. Learn to spell.