Merge pull request #134 from mukkoo/master

good!