Minor bugfixing
Merge branch 'master' of https://github.com/yhyoon12/bbhackathon2014