Update
Merge pull request #4 from buren/buren

Update
Fixed merge conflicts