initial commit
Merge pull request #3 from ffegert2011/master

initial commit