Original state, branch
Merge pull request #1 from irigi/original

Original state, branch