initial import
Merge pull request #2 from narch/master

initial import