Merge pull request #2 from TeamSubstratum/master

Merge pull request #1 from nicholaschum/master