yandod/candycane — pull request #64 by ialbors (2012-04-20 12:35:42+00:00)
Title: All changes in one pull request

I've made more changes in this branch. If you accept this one, you cand discard the last three pull requests (their commits are included in this one)