Merge jdemski master branch