Merge pull request #1 from cybergarage/master

Merge pull master branch