Merge pull request #111 from awesomized/awesomized