mxmxmx Merge pull request #97 from mxmxmx/136