Merge pull request #1 from OctoFalcon/master

Sync with OctoFalcon:master
Datasource file for local
Merge pull request #28 from alffrey/master

Merge into OctoFalcon:master