Bug fixes & Class ordering. Release v0.0.2