Merge pull request #442 from coolsmile/development