initial file import, try 2
Merge pull request #1 from einhverfr/master

initial file import, try 2