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

Merge r2557 into master