Merge pull request #245 from jdemar/master