Merge pull request #18 from grappler/develop

fix two issues