Merge pull request #1 from 5sw/master

Fix all warnings