Resolved issue #2

Reference: https://github.com/Deathspike/gaikan/issues/2