Merge pull request #59 from psichi/develop

Merge pull request #58 from psichi/master
Merge pull request #60 from psichi/develop

Develop
Merge pull request #61 from psichi/develop

Develop
Merge pull request #63 from psichi/develop

Develop
Merge pull request #64 from psichi/develop

Develop
Merge pull request #65 from psichi/develop

Develop
Merge pull request #66 from psichi/master

Merge back