Mine

update with changes from franbenz:mine branch