Completed work.
Merge pull request #1 from raychorn/release1

Completed work.