Merge pull request #18 from riolet/develop

Develop

Merge pull request #17 from riolet/develop

Develop

Merge pull request #15 from riolet/develop

Correcting README typo

Merge pull request #11 from riolet/develop

Develop

Merge pull request #9 from riolet/develop

Develop