Merge pull request #9 from TKramez/Dev

Dev