dev changes
Merge pull request #16 from gmartinez/support

Merge r2552 into master