more changes
Merge branch 'd3test' of github.com:weareytm/Ragnarok into d3test