Merge pull request #249 from phracek/master

Rebased assistants