Merge pull request #11 from rstarzl/trunk

Merge pull request #6 from rstarzl/master