Fix bug #47
Merge branch 'master' of github.com:rzetterberg/fastalook