Merge pull request #43 from Forceflow/master

pull