More API security

Fixed #9.