Merge pull request #65 from ferrix/pull_queue

Tested and prepared combined pull requests