bug when orchestra.db is empty
Merge branch 'master' of github.com:Alkpone/Orchestra