fix #66, add support to multi sources
Merge branch 'dev-multisource'