Merge pull request #7 from jcrom/master

merge with trunk
prepare for publish
Prepare 0.3.0 release