Merge branch 'jn'
Merge branch 'master' of https://github.com/coderfox/Amber