Merge pull request #12 from rstarzl/master

Merge pull request #11 from rstarzl/trunk
Merge pull request #5 from rstarzl/trunk

Merge pull request #12 from rstarzl/master