More Work
Merge pull request #26 from swndr/master

More Work