Fix deprecated warnings
Merge pull request #21 from ybw/master

Fix deprecated warnings