dev changes
dev changes
Merge pull request #19 from gmartinez/support

Merge r2565 into master