[Handy] updated for new API, fixed bugs, added warnings. Now v2.
Merge remote-tracking branch 'origin/master'