Merge pull request #1 from eipeele/master

Ryan is merging forks