Fixes #13 + validates on push api call