Code cleanup.
Bug fix cache.
Remove dependencies.
Merge pull request #56 from dixso/develop

Develop