added dbname support
Merge branch 'master' of github.com:jianingy/almar