Merge pull request #202 from ping19/master

Clear warnings