Merge pull request 4/1/13

Trying to merge for the first time