Merge pull request #1 from Lepistina/master

merging branches
updaing files
Merge pull request #6 from kimwalters/master

changes