Small code refactoring, updated README, new version 0.1.1