nick april 11
Merge pull request #1 from npicard/master

nick april 11