Merge pull request #13 from TKramez/Dev

Dev