Merge pull request #1 from stuyfission/master

Update
Merge pull request #37 from sebastianCain/master

Merge pull request #1 from stuyfission/master