berginson/master

Ok. Fixed the mine-mine-mine problem. You only have to merge it.