Fixed whitespace bug, updated for new API (26/07)