Replaced spaces by tabs
Started implementation
Fixed tests
Merge pull request #2 from amercier/branch

Add branch information