Pr/6

merging pull request. from @teamktown