Taming to mount

Fetched from 0.3 and made some changes to make it work with 1.0