Issue: EE-1 (#1)

  * Added register handling