zolrath Merge pull request #7 from jraqula/master