Merge pull request #11 from sunchaserinfo/upstream

deprecation warning fix & unreachable code fix
Add license, Fixes #10.