Merge commit
Merge commit
Small bug fix
Merge branch 'master' of https://github.com/mapto/sprks