Conflict resolution with master
Merge branch 'liafailboy-working'
Merge pull request #21 from andhieka/master

Merge Shotaro's work