Random commit
Weird changes
Merge request fixed
Fix bugs
Merge pull request #12 from cicadas-2014/bug_fix

Bug fix