dev2 commit1
Merge pull request #4 from danielthank/developement2

Merge