Merge pull request #115 from duiker2/master

warning fixes