Merge pull request #894 from gannetson/crazy-branch

Crazy branch
Some fixes after merging