Merge pull request #63 from YfLn/master

Merging master into Elli