updates per Nick's request
Merge branch 'beta' of github.com:rpruim/mosaic into beta