Updates and bugfixes
Merge https://github.com/sara-nl/eth-oam