kylebgorman Merge pull request #4 from gerazov/master