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