Initial checkin
Merge pull request #1 from matfed/master

Initial checkin