Merge pull request #30 from Ekhoo/master

Fix potential retain cycle