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

Merge r2518 into master