Merge pull request #1 from nicoyuste/master

Bug fixed with color equal to nil.