Merge branch 'develop'
Merge branch 'develop'
Fix indentation
Merge pull request #25 from KeithYokoma/fixture/Indent

Fixture/indent