Replaced local.properties with non.cfg
Some small fixes
Merge pull request #7 from deathbeam/master

More commits