Merge pull request #4 from kimsyversen/master

Integrate branch