vacuum offset slight bug
fixed conflict
Merge pull request #47 from tpott/feature/misc

Feature/misc