added Flo's changes and updated to v1.2
Merge pull request #1 from jrutter/master

Merged Changes