Merge pull request #157 from shutter111/master

CI Box updates