1.0 Branch
Merge pull request #2 from mgibbs189/1.0

1.0 Branch