Something has gone wrong
Bugfixes and cleanup
Merge pull request #1 from galorin/Fixing

Fixing