Fixing off by one for candle.
Adding time to objects and making the default name based on class.
Merge remote-tracking branch 'origin/master'