Em claims

For issues #48 and #49