Merge pull request #7 from feri/overhaul

Pull request