Merge pull request #28 from zcdziura/develop

Merging in Stephen's change plus removed v1 directory
Fixed indentation