merge pull request 120
Minor clenaup on pullrequest 120.