Merge pull request #3 from stuyfission/master

Merge pull request #40 from sebastianCain/master
Merge pull request #41 from sebastianCain/master

Merge pull request #3 from stuyfission/master