dev branch added
Merge pull request #1 from Iluvatar/dev

dev branch added