Merge pull request #19 from TKramez/Dev

Dev