Organizing
Merge pull request #56 from swndr/master

Organizing