Merge pull request #5 from TKramez/Dev

Dev