Updated for v1.1
Merge pull request #32 from Forceflow/working

Updated for v1.1