V0.0.1 eap.2

Fix for #1 & #2.