Issue 539

Fixed API Level selection issues