Merge pull request #13 from alexindigo/master

Organizing stuff that has already been merged.