First version
Merge pull request #2 from reubenleibow/master

First version