Fixes #212.
Merge pull request #216 from AshFurrow/resolution

@orta => Fixes #212.