Updated to current core version. Fixed #2.