Merge pull request #63 from YfLn/master

Merging master into Elli
Merge pull request #65 from YfLn/Elli

Merge pull request #63 from YfLn/master