Merge pull request #5 from awoland/master
authorBalthazar <balthazar@yandex.ru>
Sun, 18 Aug 2013 16:46:39 +0000 (09:46 -0700)
committerBalthazar <balthazar@yandex.ru>
Sun, 18 Aug 2013 16:46:39 +0000 (09:46 -0700)

Trivial merge