Fixes #20
Merge branch 'dev' of https://github.com/michellehoda/simsam into dev