Fixes #45
Merge branch 'master' of https://github.com/pachiara/alice