Merge tag '1.0' into develop

1.0 release 6/3/2013
Merge pull request #1 from Jasrags/develop

Merge tag '1.0' into develop