Merge pull request #43 from Forceflow/master

pull
Merge pull request #44 from Forceflow/working

Merge pull request #43 from Forceflow/master