Updates
Merge pull request #328 from awolfs/master

Updates for Amsterdam