More Amber updates
Merge pull request #49 from chylex/master

More Amber updates