Fixed formatting.
Merge master branch back to andrew-temp branch.
Merge pull request #10 from lbondaryk/andrew-temp

Andrew temp