First commit
Merge branch 'master' of github.com:metavis/acml13