Version 0.8 - added nested folder support