First real commit
Merge pull request #1 from tpritc/master

First real commit