Merge pull request #33 from wick-ed/master

reviewed diff and tested locally with 0.6.0beta1