beta 0.5
Merge pull request #13 from jvcerver/master

beta 0.5