Reverting master branch to glamour 1.0.4