Collector
Merge branch 'master' of /home/mnaegele/edward