Merge branch 'master' of github.com:txsl/icumad

Don't get this seeing as I'm the only one working on this...