Merge pull request #1 #2 #3 from calebbradley/master