Bug #369
Merge pull request #382 from cocojoe/develop-v3

Bug #369