settings done
done.
Merge pull request #1 from Tailzip/develop

Merfe develop into master