Related to #91
Merge pull request #94 from blueful/master

Related to #91