Merge pull request #197 from mindsocket/master