Merge pull request #1 from wlgys8/master

update from wlgys8
Merge pull request #2 from wlgys8/master

update from wlgys8
fix warnings

fix warnings
Merge pull request #3 from wlgys8/master

update from wlgys8
Merge pull request #2 from waiter/master

fix warnings