Merge jdembski master branch