Merge pull request #241 from kgkilo/master