first 2.0 checkin, fix #39
Merge branch 'master' of github.com:imsky/holder