Merge pull request #1 from samilliken/master

Samiliken
Merge pull request #208 from jomigom/master

Merge #2