Also updated CHANGELOG :P