Merged Illya's changes.
Merge pull request #7 from brylie/master

Indentation, testing merge.