Refactoring.
Merge branch 'master' of github.com:iliabylich/winged-couch