Merge pull request #29 from ajinisen/master

edited