Merge pull request #8 from besser82/improvements

Unified codebase