Small dev branch changes
Merge pull request #122 from emreeren/dev

Small dev branch changes