Merge pull request #36 from saturn597/master