dev changes
Merge pull request #14 from gmartinez/support

Merge r2525 into master