Merge pull request #49 from dottorblaster/master