Rolling back changes made by mistake.
Merge pull request #14 from oliora/master

Rolling back changes made by mistake.