Fix important issues to make scan work

See #3
Merge branch 'scan' of github.com:rafaeljusto/shelter into scan